Skip to content

KAFKA-18405: Remove ZooKeeper logic from DynamicBrokerConfig #18508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Jan 16, 2025
Merged

KAFKA-18405: Remove ZooKeeper logic from DynamicBrokerConfig #18508

merged 3 commits into from
Jan 16, 2025

Conversation

@FrankYang0529
Copy link
Member

@FrankYang0529 FrankYang0529 commented Jan 13, 2025 •
edited
Loading

  • Remove zkClientOpt in DynamicBrokerConfig.
  • Remove advertised.listeners from ReconfigurableConfigs and related logic.

Committer Checklist (excluded from commit message)

  • Verify design and implementation
  • Verify test coverage and CI build status
  • Verify documentation (including upgrade notes)

@github-actions github-actions bot added core Kafka Broker small Small PRs labels Jan 13, 2025
@chia7712
Copy link
Member

@FrankYang0529 Do you plan to handle #18384 (comment) in this PR? or this PR is used to remove zkClientOpt only? I'm ok to merge it for removing zkClientOpt only. Maybe @m1a2st could address it in #18390

@mimaison WDYT?

@FrankYang0529
Copy link
Member Author

FrankYang0529 commented Jan 14, 2025 •
edited
Loading

Hi @chia7712, I will handle it in this PR because this Jira is created by that thread. Thanks.

@github-actions github-actions bot removed the small Small PRs label Jan 14, 2025
@FrankYang0529
Copy link
Member Author

Hi @chia7712, I have updated PR to handle "advertised.listeners" and failed cases in CI are flaky:

chia7712
chia7712 reviewed Jan 14, 2025
View reviewed changes
Copy link
Member

@chia7712 chia7712 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@FrankYang0529 thanks for this patch!

core/src/main/scala/kafka/server/DynamicBrokerConfig.scala Outdated
throw new ConfigException(s"Security protocol cannot be updated for existing listener $listenerName")
}
if (!newAdvertisedListeners.contains(newConfig.interBrokerListenerName))
if (!oldAdvertisedListeners.contains(newConfig.interBrokerListenerName))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is interBrokerListenerName a kind of dynamic config? If not, KafkaConfig has checked it in initialization.

core/src/main/scala/kafka/server/DynamicBrokerConfig.scala Outdated
val oldConfig = server.config
val newListeners = listenersToMap(newConfig.listeners)
val newAdvertisedListeners = listenersToMap(newConfig.effectiveAdvertisedBrokerListeners)
val oldAdvertisedListeners = listenersToMap(oldConfig.effectiveAdvertisedBrokerListeners)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it seems we can use Set instead of Map, right?

@m1a2st m1a2st mentioned this pull request Jan 15, 2025
Merged
3 tasks
@FrankYang0529
Copy link
Member Author

Hi @chia7712, I address all comments. Could you take a look when you have time? Thank you.

chia7712
chia7712 approved these changes Jan 16, 2025
View reviewed changes
Copy link
Member

@chia7712 chia7712 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but I have one follow-up comment.

core/src/main/scala/kafka/server/DynamicBrokerConfig.scala
*/
val ReconfigurableConfigs = Set(
// Listener configs
SocketServerConfigs.ADVERTISED_LISTENERS_CONFIG,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@FrankYang0529 Could you please file a minor follow-up to add this change to zk2kraft.html?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I will create a minor PR for it. Thanks.

@chia7712 chia7712 merged commit 25f2ed0 into apache:trunk Jan 16, 2025
9 checks passed
chia7712 pushed a commit that referenced this pull request Jan 16, 2025
@FrankYang0529 @chia7712
KAFKA-18405 Remove ZooKeeper logic from DynamicBrokerConfig (#18508)
6df2977 
Reviewers: Chia-Ping Tsai <[email protected]>
@FrankYang0529 FrankYang0529 deleted the KAFKA-18405 branch January 16, 2025 11:27
@FrankYang0529 FrankYang0529 mentioned this pull request Jan 16, 2025
Merged
3 tasks
pranavt84 pushed a commit to pranavt84/kafka that referenced this pull request Jan 27, 2025
@FrankYang0529 @pranavt84
KAFKA-18405 Remove ZooKeeper logic from DynamicBrokerConfig (apache#1…
737bbd1 
…8508)

Reviewers: Chia-Ping Tsai <[email protected]>
airlock-confluentinc bot pushed a commit to confluentinc/kafka that referenced this pull request Jan 27, 2025
@FrankYang0529 @mjsax
KAFKA-18405 Remove ZooKeeper logic from DynamicBrokerConfig (apache#1…
113d6ac 
…8508)

Reviewers: Chia-Ping Tsai <[email protected]>
manoj-mathivanan pushed a commit to manoj-mathivanan/kafka that referenced this pull request Feb 19, 2025
@FrankYang0529 @manoj-mathivanan
KAFKA-18405 Remove ZooKeeper logic from DynamicBrokerConfig (apache#1…
0518777 
…8508)

Reviewers: Chia-Ping Tsai <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@chia7712 chia7712 chia7712 approved these changes

Assignees

No one assigned

Labels

core Kafka Broker

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@FrankYang0529 @chia7712